Change in openvpn[master]: reliable: Move gc_arena inside reliable_print_ids
A message that is not in the archive (sent off-list or not yet received): gerrit.1752140383000.I8cefa9a406fe90bb3cbe481304782c639691a3a0@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
to review the following change.
Change subject: reliable: Move gc_arena inside reliable_print_ids
......................................................................
reliable: Move gc_arena inside reliable_print_ids
There was no user that actually used it for
anything else. But there were some previous
users that generated a now useless gc_arena.
While looking through the code, modernize
the loop variable usage.
---
M src/openvpn/reliable.c
1 file changed, 25 insertions(+), 56 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/83/1083/1
src/openvpn/reliable.c +25 -56
@@ -446,13 +446,13 @@#ifdef ENABLE_DEBUG /* print the current sequence of active packet IDs */ static const char * -reliable_print_ids (const struct reliable *rel,struct gc_arena *gc) +reliable_print_ids (const struct reliable *rel) { -struct buffer out =alloc_buf_gc (256 , gc); -int i; +struct gc_arena gc =gc_new (); +struct buffer out =alloc_buf_gc (256 , &gc);buf_printf (&out,"[" packet_id_format"]" , (packet_id_print_type )rel->packet_id); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -460,6 +460,7 @@ buf_printf(&out, " " packet_id_format, (packet_id_print_type)e->packet_id); } } +gc_free (&gc);return BSTR (&out); }#endif /* ENABLE_DEBUG */
@@ -468,9 +469,7 @@bool reliable_can_get (const struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -478,8 +477,7 @@return true; } } -dmsg (D_REL_LOW ,"ACK no free receive buffer available: %s" ,reliable_print_ids (rel, &gc)); -gc_free (&gc); +dmsg (D_REL_LOW ,"ACK no free receive buffer available: %s" ,reliable_print_ids (rel));return false; }
@@ -487,13 +485,11 @@bool reliable_not_replay (const struct reliable *rel,packet_id_type id) { -struct gc_arena gc =gc_new (); -int i;if (reliable_pid_min (id, rel->packet_id)) { goto bad; } -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == id)
@@ -501,12 +497,10 @@ goto bad; } } -gc_free (&gc);return true; bad: -dmsg (D_REL_DEBUG ,"ACK " packet_id_format" is a replay: %s" , (packet_id_print_type )id,reliable_print_ids (rel, &gc)); -gc_free (&gc); +dmsg (D_REL_DEBUG ,"ACK " packet_id_format" is a replay: %s" , (packet_id_print_type )id,reliable_print_ids (rel));return false; }
@@ -514,19 +508,15 @@bool reliable_wont_break_sequentiality (const struct reliable *rel,packet_id_type id) { -struct gc_arena gc =gc_new (); -const int ret =reliable_pid_in_range2 (id, rel->packet_id, rel->size);if (!ret) {dmsg (D_REL_LOW ,"ACK " packet_id_format" breaks sequentiality: %s" , - (packet_id_print_type )id,reliable_print_ids (rel, &gc)); + (packet_id_print_type )id,reliable_print_ids (rel)); }dmsg (D_REL_DEBUG ,"ACK RWBS rel->size=%d rel->packet_id=%08x id=%08x ret=%d" , rel->size, rel->packet_id, id, ret); - -gc_free (&gc);return ret; }
@@ -534,8 +524,7 @@struct buffer *reliable_get_buf (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -550,7 +539,6 @@int reliable_get_num_output_sequenced_available (struct reliable *rel) { -struct gc_arena gc =gc_new ();packet_id_type min_id =0 ;bool min_id_defined = false;
@@ -573,7 +561,6 @@ { ret -=subtract_pid (rel->packet_id, min_id); } -gc_free (&gc);return ret; }
@@ -581,14 +568,12 @@struct buffer *reliable_get_buf_output_sequenced (struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i;packet_id_type min_id =0 ;bool min_id_defined = false;struct buffer *ret =NULL ;/* find minimum active packet_id */ -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -607,9 +592,8 @@ }else { -dmsg (D_REL_LOW ,"ACK output sequence broken: %s" ,reliable_print_ids (rel, &gc)); +dmsg (D_REL_LOW ,"ACK output sequence broken: %s" ,reliable_print_ids (rel)); } -gc_free (&gc);return ret; }
@@ -617,8 +601,7 @@struct reliable_entry *reliable_get_entry_sequenced (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == rel->packet_id)
@@ -633,10 +616,8 @@bool reliable_can_send (const struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i;int n_active =0 , n_current =0 ; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -652,9 +633,8 @@dmsg (D_REL_DEBUG ,"ACK reliable_can_send active=%d current=%d : %s" , n_active, n_current, -reliable_print_ids (rel, &gc)); +reliable_print_ids (rel)); -gc_free (&gc);return n_current >0 && !rel->hold; }
@@ -662,11 +642,10 @@struct buffer *reliable_send (struct reliable *rel,int *opcode) { -int i;struct reliable_entry *best =NULL ;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];
@@ -701,10 +680,9 @@void reliable_schedule_now (struct reliable *rel) { -int i;dmsg (D_REL_DEBUG ,"ACK reliable_schedule_now" ); rel->hold = false; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -720,12 +698,10 @@interval_t reliable_send_timeout (const struct reliable *rel) { -struct gc_arena gc =gc_new ();interval_t ret =BIG_TIMEOUT ; -int i;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -744,9 +720,8 @@dmsg (D_REL_DEBUG ,"ACK reliable_send_timeout %d %s" , (int ) ret, -reliable_print_ids (rel, &gc)); +reliable_print_ids (rel)); -gc_free (&gc);return ret; }
@@ -758,8 +733,7 @@ reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid, int opcode) { - int i; -for (i =0 ; i < rel->size; ++i) + for (int i = 0; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -790,8 +764,7 @@void reliable_mark_active_outgoing (struct reliable *rel,struct buffer *buf,int opcode) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -817,8 +790,7 @@void reliable_mark_deleted (struct reliable *rel,struct buffer *buf) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -836,10 +808,8 @@void reliable_ack_debug_print (const struct reliable_ack *ack,char *desc) { -int i; -printf ("********* struct reliable_ack %s\n" , desc); -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {printf (" %d: " packet_id_format"\n" , i, (packet_id_print_type ) ack->packet_id[i]); }
@@ -848,14 +818,13 @@void reliable_debug_print (const struct reliable *rel,char *desc) { -int i;update_time ();printf ("********* struct reliable %s\n" , desc);printf (" initial_timeout=%d\n" , (int )rel->initial_timeout);printf (" packet_id=" packet_id_format"\n" , rel->packet_id);printf (" now=%" PRIi64"\n" , (int64_t )now); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
[Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage
In reply to a message not in the archiveAttention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email )
Change subject: reliable: Review and fix gc_arena usage
......................................................................
Patch Set 3:
This change is ready for review.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Fri, 11 Jul 2025 10:09:41 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email )
Change subject: reliable: Review and fix gc_arena usage
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
Patchset:
PS3:
This looks generally good to me - move int i declarations inside for (int i;...) loops, move gc_arena declarations into the error case, thus avoiding malloc/free calls in the fast path.
The OpenBSD test fails were due to local problems (stuck openvpn process, so t_client failed the "must not ping before OpenVPN is up" check).
I would prefer a second pair of eyes on this, though... thus only +1
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 14 Jul 2025 09:14:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage
In reply to a message not in the archiveAttention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email )
Change subject: reliable: Review and fix gc_arena usage
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 15 Jul 2025 14:32:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v3 1/1 reliable: Review and fix gc_arena usage
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
Check for unused objects (inreliable_get_num_output_sequenced_available)
and missing free (in reliable_can_get).
While looking through the code, modernize
the loop variable usage.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1083
This mail reflects revision 3 of this Change.
Acked-by according to Gerrit (reflected above):
Arne Schwabe <[email protected]...>
src/openvpn/reliable.c +29 -56
@@ -98,8 +98,7 @@static inline bool reliable_ack_packet_id_present (struct reliable_ack *ack,packet_id_type pid) { -int i; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {if (ack->packet_id[i] == pid) {
@@ -312,10 +311,7 @@const char *reliable_ack_print (struct buffer *buf,bool verbose,struct gc_arena *gc) { -int i;uint8_t n_ack; -struct session_id sid_ack; -packet_id_type pid;struct buffer out =alloc_buf_gc (256 , gc);buf_printf (&out,"[" );
@@ -323,8 +319,9 @@ { goto done; } -for (i =0 ; i < n_ack; ++i) +for (int i =0 ; i < n_ack; ++i) { +packet_id_type pid;if (!buf_read (buf, &pid,sizeof (pid))) { goto done;
@@ -334,6 +331,7 @@ }if (n_ack) { +struct session_id sid_ack;if (!session_id_read (&sid_ack, buf)) { goto done;
@@ -356,14 +354,12 @@void reliable_init (struct reliable *rel,int buf_size,int offset,int array_size,bool hold) { -int i; -CLEAR (*rel);ASSERT (array_size >0 && array_size <=RELIABLE_CAPACITY ); rel->hold = hold; rel->size = array_size; rel->offset = offset; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i]; e->buf =alloc_buf (buf_size);
@@ -378,8 +374,7 @@ {return ; } -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];free_buf (&e->buf);
@@ -391,8 +386,7 @@bool reliable_empty (const struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -407,11 +401,10 @@void reliable_send_purge (struct reliable *rel,const struct reliable_ack *ack) { -int i, j; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {packet_id_type pid = ack->packet_id[i]; -for (j =0 ; j < rel->size; ++j) +for (int j =0 ; j < rel->size; ++j) {struct reliable_entry *e = &rel->array[j];if (e->active && e->packet_id == pid)
@@ -449,10 +442,9 @@ reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -int i;buf_printf (&out,"[" packet_id_format"]" , (packet_id_print_type )rel->packet_id); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -468,9 +460,7 @@bool reliable_can_get (const struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -478,6 +468,7 @@return true; } } +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK no free receive buffer available: %s" ,reliable_print_ids (rel, &gc));gc_free (&gc);return false;
@@ -488,12 +479,11 @@ reliable_not_replay(const struct reliable *rel, packet_id_type id) {struct gc_arena gc =gc_new (); -int i;if (reliable_pid_min (id, rel->packet_id)) { goto bad; } -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == id)
@@ -514,19 +504,17 @@bool reliable_wont_break_sequentiality (const struct reliable *rel,packet_id_type id) { -struct gc_arena gc =gc_new (); -const int ret =reliable_pid_in_range2 (id, rel->packet_id, rel->size);if (!ret) { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK " packet_id_format" breaks sequentiality: %s" , (packet_id_print_type )id,reliable_print_ids (rel, &gc)); +gc_free (&gc); }dmsg (D_REL_DEBUG ,"ACK RWBS rel->size=%d rel->packet_id=%08x id=%08x ret=%d" , rel->size, rel->packet_id, id, ret); - -gc_free (&gc);return ret; }
@@ -534,8 +522,7 @@struct buffer *reliable_get_buf (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -550,7 +537,6 @@int reliable_get_num_output_sequenced_available (struct reliable *rel) { -struct gc_arena gc =gc_new ();packet_id_type min_id =0 ;bool min_id_defined = false;
@@ -573,7 +559,6 @@ { ret -=subtract_pid (rel->packet_id, min_id); } -gc_free (&gc);return ret; }
@@ -581,14 +566,12 @@struct buffer *reliable_get_buf_output_sequenced (struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i;packet_id_type min_id =0 ;bool min_id_defined = false;struct buffer *ret =NULL ;/* find minimum active packet_id */ -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -607,9 +590,10 @@ }else { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK output sequence broken: %s" ,reliable_print_ids (rel, &gc)); +gc_free (&gc); } -gc_free (&gc);return ret; }
@@ -617,8 +601,7 @@struct reliable_entry *reliable_get_entry_sequenced (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == rel->packet_id)
@@ -634,9 +617,8 @@ reliable_can_send(const struct reliable *rel) {struct gc_arena gc =gc_new (); -int i;int n_active =0 , n_current =0 ; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -662,11 +644,10 @@struct buffer *reliable_send (struct reliable *rel,int *opcode) { -int i;struct reliable_entry *best =NULL ;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];
@@ -701,10 +682,9 @@void reliable_schedule_now (struct reliable *rel) { -int i;dmsg (D_REL_DEBUG ,"ACK reliable_schedule_now" ); rel->hold = false; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -722,10 +702,9 @@ {struct gc_arena gc =gc_new ();interval_t ret =BIG_TIMEOUT ; -int i;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -758,8 +737,7 @@ reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid, int opcode) { - int i; -for (i =0 ; i < rel->size; ++i) + for (int i = 0; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -790,8 +768,7 @@void reliable_mark_active_outgoing (struct reliable *rel,struct buffer *buf,int opcode) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -817,8 +794,7 @@void reliable_mark_deleted (struct reliable *rel,struct buffer *buf) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -836,10 +812,8 @@void reliable_ack_debug_print (const struct reliable_ack *ack,char *desc) { -int i; -printf ("********* struct reliable_ack %s\n" , desc); -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {printf (" %d: " packet_id_format"\n" , i, (packet_id_print_type ) ack->packet_id[i]); }
@@ -848,14 +822,13 @@void reliable_debug_print (const struct reliable *rel,char *desc) { -int i;update_time ();printf ("********* struct reliable %s\n" , desc);printf (" initial_timeout=%d\n" , (int )rel->initial_timeout);printf (" packet_id=" packet_id_format"\n" , rel->packet_id);printf (" now=%" PRIi64"\n" , (int64_t )now); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
[Openvpn-devel] [PATCH applied] Re: reliable: Review and fix gc_arena usage
Stared hard at the code changes (most of them trivial, but one mem leak in one branch of reliable_can_get() fixed). Tested on client/server setups.
Your patch has been applied to the master branch.
commit 074bd7451decad407398c59006aa0e24ea1f451c
Author: Frank Lichtenheld Date: Tue Jul 15 16:37:44 2025 +0200
reliable: Review and fix gc_arena usage
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32157.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage
In reply to a message not in the archivecron2 has uploaded a new patch set (#4) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email )
The following approvals got outdated and were removed:
Code-Review+1 by cron2, Code-Review+2 by plaisthos
Change subject: reliable: Review and fix gc_arena usage
......................................................................
reliable: Review and fix gc_arena usage
Check for unused objects (inreliable_get_num_output_sequenced_available)
and missing free (in reliable_can_get).
While looking through the code, modernize
the loop variable usage.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32157.html
---
M src/openvpn/reliable.c
1 file changed, 29 insertions(+), 56 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/83/1083/4
src/openvpn/reliable.c +29 -56
@@ -98,8 +98,7 @@static inline bool reliable_ack_packet_id_present (struct reliable_ack *ack,packet_id_type pid) { -int i; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {if (ack->packet_id[i] == pid) {
@@ -312,10 +311,7 @@const char *reliable_ack_print (struct buffer *buf,bool verbose,struct gc_arena *gc) { -int i;uint8_t n_ack; -struct session_id sid_ack; -packet_id_type pid;struct buffer out =alloc_buf_gc (256 , gc);buf_printf (&out,"[" );
@@ -323,8 +319,9 @@ { goto done; } -for (i =0 ; i < n_ack; ++i) +for (int i =0 ; i < n_ack; ++i) { +packet_id_type pid;if (!buf_read (buf, &pid,sizeof (pid))) { goto done;
@@ -334,6 +331,7 @@ }if (n_ack) { +struct session_id sid_ack;if (!session_id_read (&sid_ack, buf)) { goto done;
@@ -356,14 +354,12 @@void reliable_init (struct reliable *rel,int buf_size,int offset,int array_size,bool hold) { -int i; -CLEAR (*rel);ASSERT (array_size >0 && array_size <=RELIABLE_CAPACITY ); rel->hold = hold; rel->size = array_size; rel->offset = offset; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i]; e->buf =alloc_buf (buf_size);
@@ -378,8 +374,7 @@ {return ; } -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];free_buf (&e->buf);
@@ -391,8 +386,7 @@bool reliable_empty (const struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -407,11 +401,10 @@void reliable_send_purge (struct reliable *rel,const struct reliable_ack *ack) { -int i, j; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {packet_id_type pid = ack->packet_id[i]; -for (j =0 ; j < rel->size; ++j) +for (int j =0 ; j < rel->size; ++j) {struct reliable_entry *e = &rel->array[j];if (e->active && e->packet_id == pid)
@@ -449,10 +442,9 @@ reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -int i;buf_printf (&out,"[" packet_id_format"]" , (packet_id_print_type )rel->packet_id); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -468,9 +460,7 @@bool reliable_can_get (const struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -478,6 +468,7 @@return true; } } +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK no free receive buffer available: %s" ,reliable_print_ids (rel, &gc));gc_free (&gc);return false;
@@ -488,12 +479,11 @@ reliable_not_replay(const struct reliable *rel, packet_id_type id) {struct gc_arena gc =gc_new (); -int i;if (reliable_pid_min (id, rel->packet_id)) { goto bad; } -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == id)
@@ -514,19 +504,17 @@bool reliable_wont_break_sequentiality (const struct reliable *rel,packet_id_type id) { -struct gc_arena gc =gc_new (); -const int ret =reliable_pid_in_range2 (id, rel->packet_id, rel->size);if (!ret) { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK " packet_id_format" breaks sequentiality: %s" , (packet_id_print_type )id,reliable_print_ids (rel, &gc)); +gc_free (&gc); }dmsg (D_REL_DEBUG ,"ACK RWBS rel->size=%d rel->packet_id=%08x id=%08x ret=%d" , rel->size, rel->packet_id, id, ret); - -gc_free (&gc);return ret; }
@@ -534,8 +522,7 @@struct buffer *reliable_get_buf (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -550,7 +537,6 @@int reliable_get_num_output_sequenced_available (struct reliable *rel) { -struct gc_arena gc =gc_new ();packet_id_type min_id =0 ;bool min_id_defined = false;
@@ -573,7 +559,6 @@ { ret -=subtract_pid (rel->packet_id, min_id); } -gc_free (&gc);return ret; }
@@ -581,14 +566,12 @@struct buffer *reliable_get_buf_output_sequenced (struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i;packet_id_type min_id =0 ;bool min_id_defined = false;struct buffer *ret =NULL ;/* find minimum active packet_id */ -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -607,9 +590,10 @@ }else { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK output sequence broken: %s" ,reliable_print_ids (rel, &gc)); +gc_free (&gc); } -gc_free (&gc);return ret; }
@@ -617,8 +601,7 @@struct reliable_entry *reliable_get_entry_sequenced (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == rel->packet_id)
@@ -634,9 +617,8 @@ reliable_can_send(const struct reliable *rel) {struct gc_arena gc =gc_new (); -int i;int n_active =0 , n_current =0 ; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -662,11 +644,10 @@struct buffer *reliable_send (struct reliable *rel,int *opcode) { -int i;struct reliable_entry *best =NULL ;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];
@@ -701,10 +682,9 @@void reliable_schedule_now (struct reliable *rel) { -int i;dmsg (D_REL_DEBUG ,"ACK reliable_schedule_now" ); rel->hold = false; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -722,10 +702,9 @@ {struct gc_arena gc =gc_new ();interval_t ret =BIG_TIMEOUT ; -int i;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -758,8 +737,7 @@ reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid, int opcode) { - int i; -for (i =0 ; i < rel->size; ++i) + for (int i = 0; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -790,8 +768,7 @@void reliable_mark_active_outgoing (struct reliable *rel,struct buffer *buf,int opcode) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -817,8 +794,7 @@void reliable_mark_deleted (struct reliable *rel,struct buffer *buf) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -836,10 +812,8 @@void reliable_ack_debug_print (const struct reliable_ack *ack,char *desc) { -int i; -printf ("********* struct reliable_ack %s\n" , desc); -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {printf (" %d: " packet_id_format"\n" , i, (packet_id_print_type ) ack->packet_id[i]); }
@@ -848,14 +822,13 @@void reliable_debug_print (const struct reliable *rel,char *desc) { -int i;update_time ();printf ("********* struct reliable %s\n" , desc);printf (" initial_timeout=%d\n" , (int )rel->initial_timeout);printf (" packet_id=" packet_id_format"\n" , rel->packet_id);printf (" now=%" PRIi64"\n" , (int64_t )now); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: reliable: Review and fix gc_arena usage
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email )
Change subject: reliable: Review and fix gc_arena usage
......................................................................
reliable: Review and fix gc_arena usage
Check for unused objects (inreliable_get_num_output_sequenced_available)
and missing free (in reliable_can_get).
While looking through the code, modernize
the loop variable usage.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32157.html
---
M src/openvpn/reliable.c
1 file changed, 29 insertions(+), 56 deletions(-)
src/openvpn/reliable.c +29 -56
@@ -98,8 +98,7 @@static inline bool reliable_ack_packet_id_present (struct reliable_ack *ack,packet_id_type pid) { -int i; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {if (ack->packet_id[i] == pid) {
@@ -312,10 +311,7 @@const char *reliable_ack_print (struct buffer *buf,bool verbose,struct gc_arena *gc) { -int i;uint8_t n_ack; -struct session_id sid_ack; -packet_id_type pid;struct buffer out =alloc_buf_gc (256 , gc);buf_printf (&out,"[" );
@@ -323,8 +319,9 @@ { goto done; } -for (i =0 ; i < n_ack; ++i) +for (int i =0 ; i < n_ack; ++i) { +packet_id_type pid;if (!buf_read (buf, &pid,sizeof (pid))) { goto done;
@@ -334,6 +331,7 @@ }if (n_ack) { +struct session_id sid_ack;if (!session_id_read (&sid_ack, buf)) { goto done;
@@ -356,14 +354,12 @@void reliable_init (struct reliable *rel,int buf_size,int offset,int array_size,bool hold) { -int i; -CLEAR (*rel);ASSERT (array_size >0 && array_size <=RELIABLE_CAPACITY ); rel->hold = hold; rel->size = array_size; rel->offset = offset; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i]; e->buf =alloc_buf (buf_size);
@@ -378,8 +374,7 @@ {return ; } -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];free_buf (&e->buf);
@@ -391,8 +386,7 @@bool reliable_empty (const struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -407,11 +401,10 @@void reliable_send_purge (struct reliable *rel,const struct reliable_ack *ack) { -int i, j; -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {packet_id_type pid = ack->packet_id[i]; -for (j =0 ; j < rel->size; ++j) +for (int j =0 ; j < rel->size; ++j) {struct reliable_entry *e = &rel->array[j];if (e->active && e->packet_id == pid)
@@ -449,10 +442,9 @@ reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -int i;buf_printf (&out,"[" packet_id_format"]" , (packet_id_print_type )rel->packet_id); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -468,9 +460,7 @@bool reliable_can_get (const struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -478,6 +468,7 @@return true; } } +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK no free receive buffer available: %s" ,reliable_print_ids (rel, &gc));gc_free (&gc);return false;
@@ -488,12 +479,11 @@ reliable_not_replay(const struct reliable *rel, packet_id_type id) {struct gc_arena gc =gc_new (); -int i;if (reliable_pid_min (id, rel->packet_id)) { goto bad; } -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == id)
@@ -514,19 +504,17 @@bool reliable_wont_break_sequentiality (const struct reliable *rel,packet_id_type id) { -struct gc_arena gc =gc_new (); -const int ret =reliable_pid_in_range2 (id, rel->packet_id, rel->size);if (!ret) { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK " packet_id_format" breaks sequentiality: %s" , (packet_id_print_type )id,reliable_print_ids (rel, &gc)); +gc_free (&gc); }dmsg (D_REL_DEBUG ,"ACK RWBS rel->size=%d rel->packet_id=%08x id=%08x ret=%d" , rel->size, rel->packet_id, id, ret); - -gc_free (&gc);return ret; }
@@ -534,8 +522,7 @@struct buffer *reliable_get_buf (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (!e->active)
@@ -550,7 +537,6 @@int reliable_get_num_output_sequenced_available (struct reliable *rel) { -struct gc_arena gc =gc_new ();packet_id_type min_id =0 ;bool min_id_defined = false;
@@ -573,7 +559,6 @@ { ret -=subtract_pid (rel->packet_id, min_id); } -gc_free (&gc);return ret; }
@@ -581,14 +566,12 @@struct buffer *reliable_get_buf_output_sequenced (struct reliable *rel) { -struct gc_arena gc =gc_new (); -int i;packet_id_type min_id =0 ;bool min_id_defined = false;struct buffer *ret =NULL ;/* find minimum active packet_id */ -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -607,9 +590,10 @@ }else { +struct gc_arena gc =gc_new ();dmsg (D_REL_LOW ,"ACK output sequence broken: %s" ,reliable_print_ids (rel, &gc)); +gc_free (&gc); } -gc_free (&gc);return ret; }
@@ -617,8 +601,7 @@struct reliable_entry *reliable_get_entry_sequenced (struct reliable *rel) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active && e->packet_id == rel->packet_id)
@@ -634,9 +617,8 @@ reliable_can_send(const struct reliable *rel) {struct gc_arena gc =gc_new (); -int i;int n_active =0 , n_current =0 ; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -662,11 +644,10 @@struct buffer *reliable_send (struct reliable *rel,int *opcode) { -int i;struct reliable_entry *best =NULL ;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];
@@ -701,10 +682,9 @@void reliable_schedule_now (struct reliable *rel) { -int i;dmsg (D_REL_DEBUG ,"ACK reliable_schedule_now" ); rel->hold = false; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -722,10 +702,9 @@ {struct gc_arena gc =gc_new ();interval_t ret =BIG_TIMEOUT ; -int i;const time_t local_now = now; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
@@ -758,8 +737,7 @@ reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid, int opcode) { - int i; -for (i =0 ; i < rel->size; ++i) + for (int i = 0; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -790,8 +768,7 @@void reliable_mark_active_outgoing (struct reliable *rel,struct buffer *buf,int opcode) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -817,8 +794,7 @@void reliable_mark_deleted (struct reliable *rel,struct buffer *buf) { -int i; -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {struct reliable_entry *e = &rel->array[i];if (buf == &e->buf)
@@ -836,10 +812,8 @@void reliable_ack_debug_print (const struct reliable_ack *ack,char *desc) { -int i; -printf ("********* struct reliable_ack %s\n" , desc); -for (i =0 ; i < ack->len; ++i) +for (int i =0 ; i < ack->len; ++i) {printf (" %d: " packet_id_format"\n" , i, (packet_id_print_type ) ack->packet_id[i]); }
@@ -848,14 +822,13 @@void reliable_debug_print (const struct reliable *rel,char *desc) { -int i;update_time ();printf ("********* struct reliable %s\n" , desc);printf (" initial_timeout=%d\n" , (int )rel->initial_timeout);printf (" packet_id=" packet_id_format"\n" , rel->packet_id);printf (" now=%" PRIi64"\n" , (int64_t )now); -for (i =0 ; i < rel->size; ++i) +for (int i =0 ; i < rel->size; ++i) {const struct reliable_entry *e = &rel->array[i];if (e->active)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1083?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8cefa9a406fe90bb3cbe481304782c639691a3a0
Gerrit-Change-Number: 1083
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged